Small API changes and fixup