small fixes

Change-Id: I9bd0d4c4790ca29ffa0e87cc5efd7076c8abc835