Replace a couple depreacted constants/functions