Corrected 2 bugs on media uploader