Fixing issues in Core