Fix some spec and update travis config