Changes to fix Travis failing