Miscellaneous minor build improvements.