Fixed return types.