fixed some resync issues