Further fixes for new XRootD packaging