core/FreeBSD bump and some minor changes