Fixes for all scripts