Fixed some ClientActivity stuff