Bug fixes

Change-Id: I65d80f0ec20ba546626ddd4270f1d81c04ff3c68