Dawn upload

Few changes, mostly fixes to sort compile hickups