Fixed some issues with the initial commit.