Readonly and User State fixes