fixed build errors on newest dev tools