Store fixes. Incomplete