Some more return corrections.