Bugfixes round 1