tweaks for CWD issues