Minor changes to reflect CDI behaviour.