Fixes for Travis testing environment