Minor modifications in gateway