fix build to match modern code