fix travis #3, #7, #8, #9