More global consts fixing