FL-1631: minor script fixes.