And even more fixes for previous

This is embarrassing.  Should never push changes to head without first
doing a test build in a branch and letting Travis CI chew through it.