Moar fixes in SDK