a bunch of other fixes in here, sorry
ok now what did this break
Merge branch 'store-dbic'