Fixed init stuff