Fixing obsolete functions refs