Fixed utility scripts