WIP: fixes on IJGateway