Fixes for compatibility with TeamCity 8.1.1