Some more updates in preparation for complete switch.