More Rubocop fixes