Current directory handling changes