Build and synchronization fixes for Better task reconciliation with build fixes