Fix support for syntax checking