Fix return types