Fixes on script