Add a new level of warnings and fix them