Update to newer compiler and DSL