Add build requirement and Fix makkup