Added commonmod to needed places.