Fix the building of codebase