Bugfixes based on feedback