Some bug removal.