Fix some oracle flow