fix some more return statements