hncp-03: some changes based on Pierre's comments (thanks)