Errors fixed with store