Fix issues related to build processes