Fixed issues with new scripts