Small fixes

Small fixes/cleanup before I add support for address book collections and operations.