Android and Relay fixes