Small improvements to ABS Sample