Fix returned types