Script issues resolved