Fix build master