Added fixes
Added fixes for script setup