Strict math fixes