Fixed minor Issues.