Fixes file upload 500s, also some draft/ready bugs

same as to master