More math modifications