Fixes on contact module