Several fixes to scripts.