Minor fixes

Minor fixes to store model