Fixed the build for milestone v0.7.0