Fixed directory checks