Fix build and Fix dirty finish

Change-Id: I617af7841ae4e86b11125c527ca3caea2391412a