Fixed some returned types and values.