Module contacts some fixes