Even more syntax fixes :'(