Some Bug Fixes in Manager