Postmortem fixes

from the upstream update