Changes in response to code review, trying to fix travis