Fixed a couple issues.