Few small fixes for GlobalCollect gateway