Some fixes in the pirctures product