Fixes before XML 3.11.19