Many bugfixes at once