Minor script updates