Fix my mistakes