Fixed other errors I introduced...