Fixes to call script