Fixes
Updating base to use nowrap