Made some late fixes.