Fix some small problems