Updating for ubuntu 14+ compat