fix some vars in core