Fix raet resolver routines