Fix build errors

Change-Id: I1ed033535fbbed19490ff0dc8c55cc5c5bcf54f5
Fixes: OPENSTACK-557