Fixes for the contacts module