Changes required to build recent spring on FreeBSD