Syntax fixes for v0.3 and v0.4.