Patch some bad lines and redundant messages