small fixes to see if we get a clean run on travis