Fix return types.