Fix Travis Build Errors