misc fixes / sync / to deletion