startup fixes
3.2.1 test.