Fixes to support new API changes