Respect mount_on option and fix real issue with normal uploaders