Fixes to render process