Roadblock fix in build