Fixes for scripts