Collection of small fixes

Change-Id: I61ebf465a8763a184cb0343d63b8ef225eb74931
Merge "Collection of small fixes"