Fixed travis and build