Changes to fix runtime data.len() assertion crash
Minor fix in render_context