Fixing @Natman64's changes so that depricated features still compile. (Check before you commmit)