Some rubocop warning fixes.