Fix compilation problems

I must have pushed a wip accidentally :/
Put return in spread method