xs fixes