Fixes to get test-all running again.