Logging
Minor tweaks to existing stores