CDI extension - minor improvements