Fixed directory content type + minor changes