Fixed some slot usage