Update in response to ubuntu issues.