Bugfixes & sync commit.