Update to correct bugs I introduced

I admit when I make a mistake. This would be one of those times.