Fix Travis build problems