fixes for the gateway
working wifly