Fixes to partial and rendering