Fix even more bugs found by the oracle