Fix more RuboCop offenses