Update travis and few fixes