v2 -> v3 tweaks

Signed-off-by: Andrew Jones <drjones@redhat.com>