Fix conditional syntax
Fix some more syntax errors