[BUGFIX] Invalid and deprecated calls