nanhu: misc. fixes

Change-Id: I055a6fbdab827d76ba3793e9cae7d2011fc769a7