Minor Script changes