Bugfixes, bad Behavior at the first synchronization avoided