Fix minor bugs and behaviors.