Fixes for from/to system scripts