Perf improvements

* Updating to latest aweplug with perf improvements

May see some perf for dev builds too.