Tweaked some directory handling code.