Bz1029333: fixes for cdi-alternative