Fix the bach completion and nvm stuff