Fixed more errors which git screwed up.