Fixed all aparent issues.

Fixed all aparent issues.