Next portion of bugfixes