Fix up sizing issues (as best as I can).