Miscellaneous updates for scripts