Fixed some callable stuff