Fixes for initialization bugs in new install