This seems to be two issues in one patch. What's going on with size here?