- Fixed a bunch of level 4 warnings