Fix stupid bugs