Small improvements

Fixed some of the issues when running Analyze-> Inspect Code.