ClientActivity fixes