Fix bugs from over-eager merge