Update plugins with bugfixes

Change-Id: I0604993a18a3ca473a6fb885ce2e3ed6ed88586b