[BUGFIX] Deprecated functions used in on fresh 6.0 final