Minor fixes because of changes to compiler API