Fixed a couple bugs I introduced.