Some X fixes