Fix rubocop issues for some recently merged code