Bugfixes & state synchronization