Numerous small bugfixes