Fixes to ranger and vim