fix constants in core classes some more