Fixes on contacts