Further oracle fixes