Update a few build issues for Ubuntu 13.10.