Fix several rubocop issues with "rubocop -a"
Fix a few more syntax-related rubocop issues manually