Final fixes to naughty line