Fixed a ton of items from codeanalysis