More bugfixes! (3)