A couple fixes

Change-Id: I1e61db010512d8c84a5a1ad10a6823037fc50523