Rubocop fixes to fix the build

No functional changes.