fixinng tenant mgt issues