UPDATE: Some syntax hotfixes