As for your second find. It already got fixed: https://marc.info/?l=openbsd-cvs&m=161176698927944&w=2