A few fixes found during pre-PR