Fixes for new readonly field option