Fixed CDI bean annotations