Small bugs

Change-Id: Iccb171ac5523d863e6d9554c38edc71fecd7a740