Some updates to get rid of dependency issues in build process.