Fix some production stuff