Small fixes to Dirty Tweaks

Change-Id: I6784af7b6592492e17d32b88ca65b7a98527bed8