(#1533) - Fix 40+ 80 char maxlen issues