More BSD enhancements (#970)