Modifications to prepare for Travis testing.