some more fixes to get file upload working again