Hotfix in core.git for surface sizing