Merge "Fix some "possible" divide by 0"