Fixes for xia-r2