A couple small fixes suggested by coverage data.