Miscellaneous scripts updates