Fix size/1 warnings