Minor fixes for annual layer stacking.