Fixing obsolete functions refs...