Some more size fixing