Snow compatibility fixes