Misc build cleanups

Just a couple of small details I noticed while rebuilding current master today...