Hotfix/s33 script errors