Post-build fixes