Many fixes for syntax builder