Other changes for xraystudio compatibility