National: multiple minor fixes.