Fixed various core references