Fixing new APIs