Some bugs revealed in production use fixed