ZB: Initialization bugs fixed.