Fix more bugs found by the oracle.