Fixes to latest API