Clearing warnings, fixed Make upload