Update for JukaelaCore changes
Fix conflicts