Travis file and some fixes