Fixes to compile post move to 2.2.1-dev18

Signed-off-by: Anand Subramanian <anands@redhat.com>