AQ: Fixes for Oracle