-Second wave of lint fixes
-Fixes for localization