Tweak creation of target dirs