Fix to accommodate defines changes