fixes motivated by freedfm run