Otiax fixes