Fixed 2 bugs I had missed.