utils: scripts various changes