nanhu: misc fix and cleanup

Change-Id: I5b1d64b70428b55c693d5d4a610a92f8fa39cd96