Fixed some minors problems.