Release: fix code for new APIs