fixes to key and store