Fix some bug fixes I found in 1.9