fixes for odd lines

Not sure where these came from or how the merge got weird...