Some syntax fixes