Tweak further to minimal dist build