Fixing file dependencies and mime/type