Mall modules fixes