Replaced direct calls to w to :normal w<CR>