Sizing-related bugfixes