DEP-38 components location fixes, better xml creation