Fixing obsolete functions