Quick very important bugfixes.