fix issues exposed in last travis build