Fixes for dir changing support