Fixed some issue in manager