Fix official builds