Removing some warnings with deprecated vars