Rubocop manual fixes