Contact header fixes