Tavour script fixes #5