More changes to commands to be FreeBSD specific