More sizing fixes