Bugfix

A couple of manager/plugin fixes