Fix another bunch of deprecated function calls