Fixes for build tests.

Still failing but this should get this closer.