Some syntax issues fixed