Merge "Small fixes to script based off of cry-infra"