Removed more consts on return types