Adding script fixes