Single expression should end with an EOS
Minor fixes