Gateway Fixes