Some fixes for indigo