Two small fixes found by comparing to upstream master.