Fixes for XE12