Core Define fixes