Fix a couple more build errors that showed up on a different machine
(more development goodies installed there)