Hopefully fix failing travis tests