Script - small fixes