Fix build errors

round 2