Migration adjustments
More template fixes