More bugfixes!