Fix assorted Rubocop issues