Updates and fixes to Incendio