Fixed build using recent build tools