StretchOne Bug Fixes