fix small problems, no functional change