Fixed some bad cherry-picking of lines...