Some math changes