Clean up raw output
Fix render_png specs