Got rid of 2 bugs I introduced.