Updates to the script for TeamCity