Contains several bugfixes from the last few years