Tighter warning controls

Warning controls and warning reductions