fixes to build in newer environment