Change return types of some functions