Adjust various things for new architecture (sans polylot)