Fix for issues reported by static analyzer
Updated project settings