Fixed init issues