Attempted to fix a couple of issues.