Added changes from Ubuntu