Bugfixes and whatnot.