Fixed more warnings, now have a few totally clean files