Fix some math parse problems