Misc production errors fixed.