Fixed some Zero issues