Fix some syntax issues with "rubocop -a"