fixes to gateway path
3 files changed