Fix some vim goodies