Fixes #5088

also fixes more runtimes that mloc gave me