Fix client initializer