Fixed some values due to cross change