More bugfixes (5)