A few more math changes