Fix bugs in constants