Two very minor bugs not caught by 1.6m testcases