Client Infestation Bugfixes