fix compile errors that somehow got into master