Fixes for newer SDK