More math fixes!