MInor updates for testing Build Tools