Follow-up from "Misc 6-freebsd-12 fixes"

The following discussion from !27 (merged) should be addressed:

• @chris started a discussion: (+1 comment)

  We need to check this on 14 and current