Small fixes X1