Fixes in identitation to make Travis happy.