some tweaks around workdir setup