more sync fixes, avoiding double-calls