Fix small things for integration of ApexLake with Yardstick