Some additional changes for editing with vim