Fixed a couple of issues.