vim mapping fixes