Fixes thanks to the oracle.