Fix
Another fix
Some fixes in sale app