Fix various issues like specifying command line options while building, taking ownership if chmod +x fails, and using git stash to stash changes and update