Fix more build errors (thanks, travis-ci!).