BF: bug fixes arising from travis build