NWS fixes