Fix issues with slots (I hope…)

Give this a shot...