Fixed according changes in parent projects.