Fixed issues after refactoring in citrus-core