fix small problems after merge