A few fixes that slipped through the net during cherry-picking