Build/dist fixes.