Minor changes to system script.