Fixup some bad and missing returns