Fixed some issue with the POS tools.