Fixed loose ends

Change-Id: I096e33c543da6b3b73f2900c075c21936a1dcc09