Fixed some of the return types