Fixing small problems