Compatibility fixes from latest reworks