FIX: Compatibility changes for YAG 2.4