Fix SCORM generation, location field and watermark