Post-finish print fixes