Fix build errors

round 1