ContactManager fixes

Made a few fixes to the contact manager