Some updated to make travis happy.
Resolved merge conflicts.