dist-fixes - working as well as can be