Fixed up some status effect stuff