Updated depreciated functions to work with current OF Master

not sure if you want to commit these to master or your develop branch, but I was getting a lot of warnings so I thought I would fix them and push back.