Misc changes on scripts