Fixes suggested by BAH tester.