Percents calculation improvements