[563879] Accommodate platform deprecations

Signed-off-by: Ed Willink <ed@willink.me.uk>
3 files changed