Bug/syntax fixes