A note on the effects of bottom friction and non-linearity on the wind-driven ocean circulation