xorm issues fixed