Fixing several small problems