Fixed vim problems