Fixed gateway issues