Fix usage of some constants