More math changes