Fixed some things in apiOmat adapter