fixing bugs in initial post-sync implementation