changes to support the new compiler