Element client module small changes