Changes to fix vim