Calculate store value fixes