Fixes for contact app