Indigo devel fixes and updates