Compatibility fixes for snowkit