Fixed some productions bugs