Bump plugins
Sorted some mappings.