Fixup changes in API compared to master. #0