syncplan: fixed various issues as per comments