Product fix, and user form fix