Fix some vim issues