fixing for new releases of k.aws
some more vim changes