Updates to comply with ubuntu 1404