Minor fixups
Update scripts