Working on appops fixes