Fixing some build issues and making build.