Attempting to fix build errors based on TravisCI output.