Some script updates