Fixed a couples of issues.