Changes to reflect the new version of Rubocop