Fixed couple of issues.