More improvements

Change-Id: I0e391320e67d443d191338b48a2cef0cee982c51