More rubocop fixes