Updated fixes for Upload's and comments