Updates to support ubunto 14.04