Fixes for Travis. This *should* address issue #1.