This last line needs to be updated - split into separate lines for each item fixed (as listed in #1511).