Misc bug fixed in syncing inactive entities