Merge fixes for nanhu