Add some more tweaks

Change-Id: I4c2eee61c7e78aaeb986865dda52ba71a8897283