reorder fields

Signed-off-by: Seth Jennings <sjenning@redhat.com>
restore patch->objs NULL check

Signed-off-by: Seth Jennings <sjenning@redhat.com>