14.2.11 Fix minor bugs