small fixes

Change-Id: I41ad475c8d9b5ff10fd9b3905e6c327b8d2d0292