Some fixes after reading.