Fixing deprecated functions+avoid rolledback content to be checked