Version: math fixes