More small fixes

Change-Id: I8ed39b9cf4a88f3c79e9cefb0d35c3914ebfa33c