[MOD] Some minor changes

Preparation of the support of httPebble