small adjustments

Change-Id: Iaf3cfd0fbbf229e6f5a714378add1fab6b2dbe24