Readonly and disabled fields fixed