Fix rubocop errors with latest PR