Storage motion fixes

This is still being tested.