Fixed some issues with POS tools.