Fix some production methods