xtr: 2 minor fixes