Fix Plug mappings