Simple build fixes

They say that 3rd time is the charm.  Oh well, this is more like the 24th ...