Minor oracle fixes