Polishing up POS performance fix