Merge "Add some missing readonly checks:"