Build fixes

Hi Eric, please consider pulling these three minor build enhancements. Thank you!
Olaf