Fix breaking changes from last WIP