Fix a couple bugs I introduced