Fixed some issues.

EA-35.