fixed references to constants