Updates to work with new AOMRift library.