Fixing some bugs in the initialization.