Fix the blunders