Fixing up sizing issues