More return fixes.