fix issues in cdi