dist build fixes