Bugfixes, again!