Fix RTD and Goomba
-Quick untested fix for demoshields to hopefully resolve invalid client errors