Workaround SystemStore bug and fix quota store inserts