Modified some static const int variables