Fixes to prevent wrapping around of lines