Load/store fixes

Removed hard-wired width of 4, now derive it from the type