Fix missing returns