Change makefile to work in my setup
Cleanup warning for unused upload_object
Merge in master