Changes made as a result of static analysis testing #328

Closed phantomjinx closed 8 months ago