Fix some potential overflow issues (#1161)