More bugfixes (2)