Fixing depreciated stuff.