Bugfixes (again!!!)