Updated some function calls for compatability

Seems to be stable right now.