small fixes after connecting to gateway