Minor fixes for use in Grappa compiler.