Manual Rubocop fixes