14.3.1 Fix minor bugs.