Craig Varrichio Minor compatibility changes