Contact manager fix

Some fixes for the contact manager component