Minor vim fixes