Some oracle fixes