more tweaks to aid docker