Bugfixes from poll 1