Fixed more issues with depricated helpers