Bugs fixes for management tools