fix strict-overflow cases