A few minor things that make building easier

A few minor things that make building easier.  Not sure if you want to merge this into master or unstable.  Either way.