Some attempts to fix build - might need to revert some changes
Some attempts to fix build - might need to revert some changes

rpavlik/vrjuggler-2.2-debs,rpavlik/vrjuggler-2.2-debs,rpavlik/vrjuggler-2.2-debs,rpavlik/vrjuggler-2.2-debs,rpavlik/vrjuggler-2.2-debs,rpavlik/vrjuggler-2.2-debs,rpavlik/vrjuggler-2.2-debs