Fix small problems