Added some missing returns