Some changes in plugins
Use noremap to match mappings