Build and synchronization fixes for Better task reconciliation with build fixes

Obliterated the return here