Fixes and MBean support