Hotfixes for application script template