Fix some errors brought up by vi