add workaround for current sync shortcomings, other minor fixes