small fixes X1