More recent changes to NWRWAVES Config