a number of fixes to get it to run with indigo and non-Ubuntu

These should all work fine with hydro.