Fixes to get my vim config working