Misc fixes

Change-Id: I5eafe4f3fc68d834d74083822d0b74d2d4cc29d4