fix some record store stuff