some fixes for ubuntu > precise