Fixing minor oversights