Fix for small UPC codes and comments