Finally got AppLog upload to work
Minor merging changes