Fix client modules