HomeFreeBSD

Adjust code based on comments from @asomers in D19551