Fix some bugs I found in 1.9