Start with fixes for the newer API