Small fixes (bought bug and depreciated method changed)