Extra bugfixes