Recommit to fix compile bugs