Changes to support Unbutu 12+
Changes for Ubuntu 12+ support