Update some extensions for 1.21 compatibility