Future-proofing against Forge changes