Correct some more minor BUG from merge