Misc tweaks and fixes

--HG--
rename : src/Store/Handlers.cs => src/Store/HandlerUtils.cs