Be more robust when unerializing plugins? This was stuff in a local branch that was not merged..