Adding in fixes for the file upload + Identity Fix