Updated scripts to work with Mac environments