Fixing minor changes