Fixes for Travis and Responsiveness
Travis Fixes