Fixed manager bugs