Fixes to make things work with the new api.