Improve Dirty Tweaks

Thanks to Andreas Stuetz

Change-Id: I8acda0974c792aa9ef98b3395472b7b353529536