Changes for indigo

A few changes required for compiling with indigo.