Fix some errors pointed out by Katz.