Add some missing returns