Persistence layer fixes for RSG "Write" support