Fixed a few of the issues in the issue list