Small gateway fixes

Couple of very small changes