80 char limit fixes