dist-fixes - removed system references in distrib