Pet Swapper Fixes