initial build fixes.