Fixed directory handling