GX Flexible Client fixes