Fixed a couple of issues uncovered by the store test

1 job for master in 9 minutes (queued for 1 second)