Fixed some gateway stuff.