Fixing core references