- more build fixes; still doesn't build correctly