Minor changes to enable CDI.