Various tweaks for distributable