Fixed some other issues.