more minor fixes

Change-Id: I9a8a673b8d87098e5e761e88879640d220b0f804