Bugfixes for everyone!