#641: changes related to read-only mode