Fix marketplace package
Fix scripts